From 2e9d882a69fa9e1f45b3de56d0547d99caaf5780 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Sat, 26 Nov 2005 10:43:27 +0100 Subject: [PATCH] Clean the arch_memory_op() for-loop header. Signed-off-by: Keir Fraser --- xen/arch/x86/x86_64/mm.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 7285a80fb6..3a8e114603 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -190,7 +190,8 @@ long arch_memory_op(int op, void *arg) if ( copy_from_user(&xmml, arg, sizeof(xmml)) ) return -EFAULT; - for ( i = 0, v = RDWR_MPT_VIRT_START; v != RDWR_MPT_VIRT_END; + for ( i = 0, v = RDWR_MPT_VIRT_START; + (i != xmml.max_extents) && (v != RDWR_MPT_VIRT_END); i++, v += 1 << 21 ) { l3e = l4e_to_l3e(idle_pg_table[l4_table_offset(v)])[ @@ -201,8 +202,6 @@ long arch_memory_op(int op, void *arg) if ( !(l2e_get_flags(l2e) & _PAGE_PRESENT) ) break; mfn = l2e_get_pfn(l2e) + l1_table_offset(v); - if ( i == xmml.max_extents ) - break; if ( put_user(mfn, &xmml.extent_start[i]) ) return -EFAULT; } -- 2.30.2